Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

coprocessor: Exceed action for copiterator (#17324) #18392

Merged
merged 6 commits into from
Jul 15, 2020
Merged

coprocessor: Exceed action for copiterator (#17324) #18392

merged 6 commits into from
Jul 15, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #17324 to release-4.0

What problem does this PR solve?

Close #16104

Add a new ExceedAction for TableReader Executor. This action would end the copItWorker when the session's memory tracker meet exceed situation.

To see how endCopWorker work, I prepare a table with some data.
First I set mem_quota as a big number to know the whole memory consume to read this table. The result is about 177MB.

Second, I set mem_quota as 150MB and rerun select * from t. The result returned successfully and from log we can see the TableReader Executor have meet memory exceed some times and each time a copIteratorWorker end its life.

mysql> set @@tidb_mem_quota_query=999999999999;
Query OK, 0 rows affected (0.04 sec)

mysql> explain analyze select * from t;
+-----------------------+-----------+---------+-----------+---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------+-----------------------+------+
| id                    | estRows   | actRows | task      | access object | execution info                                                                                                                                                      | operator info        | memory                | disk |
+-----------------------+-----------+---------+-----------+---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------+-----------------------+------+
| TableReader_5         | 524288.00 | 524288  | root      |               | time:1.05298823s, loops:517, rpc num: 7, rpc max:1.052561892s, min:1.068474ms, avg:775.820236ms, p80:1.032669077s, p95:1.052561892s, proc keys max:90280, p95:90280 | data:TableFullScan_4 | 177.71014976501465 MB | N/A  |
| └─TableFullScan_4     | 524288.00 | 524288  | cop[tikv] | table:t       | proc max:189ms, min:0s, p80:155ms, p95:189ms, iters:541, tasks:7                                                                                                    | keep order:false     | N/A                   | N/A  |
+-----------------------+-----------+---------+-----------+---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------+-----------------------+------+
2 rows in set (1.09 sec)

mysql> set @@tidb_mem_quota_query=157286400;
Query OK, 0 rows affected (0.03 sec)

mysql> explain analyze select * from t;
+-----------------------+-----------+---------+-----------+---------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------+-----------------------+------+
| id                    | estRows   | actRows | task      | access object | execution info                                                                                                                                                       | operator info        | memory                | disk |
+-----------------------+-----------+---------+-----------+---------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------+-----------------------+------+
| TableReader_5         | 524288.00 | 524288  | root      |               | time:1.562359985s, loops:517, rpc num: 7, rpc max:1.561153288s, min:855.179µs, avg:975.741905ms, p80:1.328606609s, p95:1.561153288s, proc keys max:90280, p95:90280  | data:TableFullScan_4 | 177.71014976501465 MB | N/A  |
| └─TableFullScan_4     | 524288.00 | 524288  | cop[tikv] | table:t       | proc max:174ms, min:0s, p80:160ms, p95:174ms, iters:541, tasks:7                                                                                                     | keep order:false     | N/A                   | N/A  |
+-----------------------+-----------+---------+-----------+---------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------+-----------------------+------+
2 rows in set (1.64 sec)
[2020/05/21 13:25:58.298 +00:00] [INFO] [set.go:207] ["set session var"] [conn=10] [name=tidb_mem_quota_query] [val=999999999999]
[2020/05/21 13:26:03.360 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:772.066897ms txnStartTS:416826671120252929 region_id:2 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:03.387 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:798.414087ms txnStartTS:416826671120252929 region_id:48 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:03.416 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:827.837719ms txnStartTS:416826671120252929 region_id:56 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:03.535 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:946.123512ms txnStartTS:416826671120252929 region_id:52 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:03.621 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:1.032669077s txnStartTS:416826671120252929 region_id:46 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:03.641 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:1.052561892s txnStartTS:416826671120252929 region_id:50 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:08.893 +00:00] [INFO] [set.go:207] ["set session var"] [conn=10] [name=tidb_mem_quota_query] [val=157286400]
[2020/05/21 13:26:13.048 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:866.077268ms txnStartTS:416826673636835329 region_id:52 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:13.068 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:886.417388ms txnStartTS:416826673636835329 region_id:48 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:13.068 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=186342598] [quota=157286400]
[2020/05/21 13:26:13.068 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-0]
[2020/05/21 13:26:13.090 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:908.466351ms txnStartTS:416826673636835329 region_id:56 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:13.090 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=186342598] [quota=157286400]
[2020/05/21 13:26:13.090 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-5]
[2020/05/21 13:26:13.460 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:1.278617255s txnStartTS:416826673636835329 region_id:2 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:13.460 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=168649583] [quota=157286400]
[2020/05/21 13:26:13.460 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-4]
[2020/05/21 13:26:13.510 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:1.328606609s txnStartTS:416826673636835329 region_id:46 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:13.510 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=168649574] [quota=157286400]
[2020/05/21 13:26:13.510 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-2]
[2020/05/21 13:26:13.743 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:1.561153288s txnStartTS:416826673636835329 region_id:50 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:26:13.743 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=186085606] [quota=157286400]
[2020/05/21 13:26:13.743 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-1]
[2020/05/21 13:26:23.762 +00:00] [INFO] [gc_worker.go:615] ["[gc worker] start delete ranges"] [uuid=5c8dd7cb070000d] [ranges=0]
[2020/05/21 13:26:23.762 +00:00] [INFO] [gc_worker.go:644] ["[gc worker] finish delete ranges"] [uuid=5c8dd7cb070000d] ["num of ranges"=0] ["cost time"=646ns]
[2020/05/21 13:26:23.764 +00:00] [INFO] [gc_worker.go:667] ["[gc worker] start redo-delete ranges"] [uuid=5c8dd7cb070000d] ["num of ranges"=0]
[2020/05/21 13:26:23.764 +00:00] [INFO] [gc_worker.go:696] ["[gc worker] finish redo-delete ranges"] [uuid=5c8dd7cb070000d] ["num of ranges"=0] ["cost time"=4.214µs]
[2020/05/21 13:26:23.767 +00:00] [INFO] [gc_worker.go:1426] ["[gc worker] sent safe point to PD"] [uuid=5c8dd7cb070000d] ["safe point"=416826493163798528]

finally, i set memory_quota as 65MB and meet panic action.

mysql> set @@tidb_mem_quota_query=68157400;
Query OK, 0 rows affected (0.03 sec)

mysql> explain analyze select * from t;
ERROR 1105 (HY000): Out Of Memory Quota![conn_id=10]
[2020/05/21 13:42:42.924 +00:00] [INFO] [set.go:207] ["set session var"] [conn=10] [name=tidb_mem_quota_query] [val=68157400]
[2020/05/21 13:42:44.392 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:481.291965ms txnStartTS:416826933605040129 region_id:2 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:42:44.392 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=75479438] [quota=68157400]
[2020/05/21 13:42:44.392 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-6]
[2020/05/21 13:42:44.393 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=75478197] [quota=68157400]
[2020/05/21 13:42:44.483 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:571.386139ms txnStartTS:416826933605040129 region_id:48 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:42:44.483 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-3]
[2020/05/21 13:42:44.483 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=75478197] [quota=68157400]
[2020/05/21 13:42:44.499 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:587.504418ms txnStartTS:416826933605040129 region_id:50 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:42:44.499 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-1]
[2020/05/21 13:42:44.499 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=93171213] [quota=68157400]
[2020/05/21 13:42:44.688 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:776.685635ms txnStartTS:416826933605040129 region_id:52 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:42:44.688 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-2]
[2020/05/21 13:42:44.688 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=92914221] [quota=68157400]
[2020/05/21 13:42:44.711 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:800.210974ms txnStartTS:416826933605040129 region_id:46 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:42:44.711 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-0]
[2020/05/21 13:42:44.711 +00:00] [INFO] [coprocessor.go:1186] ["memory exceeds quota, end one copIterator worker."] [consumed=93171213] [quota=68157400]
[2020/05/21 13:42:44.857 +00:00] [INFO] [coprocessor.go:904] ["[TIME_COP_PROCESS] resp_time:946.187009ms txnStartTS:416826933605040129 region_id:56 store_addr:basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160"] [conn=10]
[2020/05/21 13:42:44.857 +00:00] [INFO] [coprocessor.go:519] ["memory exceeds quota, end one copIterator worker."] ["copIteratorWorker id "=copIteratorWorker-4]
[2020/05/21 13:42:44.857 +00:00] [WARN] [expensivequery.go:167] [expensive_query] [cost_time=0.946362191s] [cop_time=0.797327636s] [process_time=0.325s] [request_count=6] [total_keys=434015] [process_keys=434008] [num_cop_tasks=6] [process_avg_time=0.054166666s] [process_p90_time=0.078s] [process_max_time=0.078s] [process_max_addr=basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160] [wait_avg_time=0s] [wait_p90_time=0s] [wait_max_time=0s] [wait_max_addr=basic2-tikv-0.basic2-tikv-peer.gaosong.svc:20160] [conn_id=10] [user=root] [database=test] [table_ids="[45]"] [txn_start_ts=416826933605040129] [mem_max="186342598 Bytes (177.71014976501465 MB)"] [sql="explain analyze select * from t"]
[2020/05/21 13:42:44.858 +00:00] [ERROR] [adapter.go:123] ["execute sql panic"] [conn=10] [sql="explain analyze select * from t"] [stack="github.com/pingcap/tidb/executor.(*recordSet).Next.func1\n\t/go/src/github.com/pingcap/tidb/executor/adapter.go:123\nruntime.gopanic\n\t/usr/local/go/src/runtime/panic.go:679\ngithub.com/pingcap/tidb/util/memory.(*PanicOnExceed).Action\n\t/go/src/github.com/pingcap/tidb/util/memory/action.go:96\ngithub.com/pingcap/tidb/store/tikv.(*EndCopWorkerAction).Action\n\t/go/src/github.com/pingcap/tidb/store/tikv/coprocessor.go:1179\ngithub.com/pingcap/tidb/util/memory.(*Tracker).Consume\n\t/go/src/github.com/pingcap/tidb/util/memory/tracker.go:231\ngithub.com/pingcap/tidb/store/tikv.(*copIterator).recvFromRespCh\n\t/go/src/github.com/pingcap/tidb/store/tikv/coprocessor.go:606\ngithub.com/pingcap/tidb/store/tikv.(*copIterator).Next\n\t/go/src/github.com/pingcap/tidb/store/tikv/coprocessor.go:653\ngithub.com/pingcap/tidb/distsql.(*selectResult).fetchResp\n\t/go/src/github.com/pingcap/tidb/distsql/select_result.go:95\ngithub.com/pingcap/tidb/distsql.(*selectResult).readFromChunk\n\t/go/src/github.com/pingcap/tidb/distsql/select_result.go:209\ngithub.com/pingcap/tidb/distsql.(*selectResult).Next\n\t/go/src/github.com/pingcap/tidb/distsql/select_result.go:164\ngithub.com/pingcap/tidb/executor.(*tableResultHandler).nextChunk\n\t/go/src/github.com/pingcap/tidb/executor/table_reader.go:295\ngithub.com/pingcap/tidb/executor.(*TableReaderExecutor).Next\n\t/go/src/github.com/pingcap/tidb/executor/table_reader.go:181\ngithub.com/pingcap/tidb/executor.Next\n\t/go/src/github.com/pingcap/tidb/executor/executor.go:268\ngithub.com/pingcap/tidb/executor.(*ExplainExec).generateExplainInfo\n\t/go/src/github.com/pingcap/tidb/executor/explain.go:86\ngithub.com/pingcap/tidb/executor.(*ExplainExec).Next\n\t/go/src/github.com/pingcap/tidb/executor/explain.go:53\ngithub.com/pingcap/tidb/executor.Next\n\t/go/src/github.com/pingcap/tidb/executor/executor.go:268\ngithub.com/pingcap/tidb/executor.(*recordSet).Next\n\t/go/src/github.com/pingcap/tidb/executor/adapter.go:126\ngithub.com/pingcap/tidb/server.(*tidbResultSet).Next\n\t/go/src/github.com/pingcap/tidb/server/driver_tidb.go:369\ngithub.com/pingcap/tidb/server.(*clientConn).writeChunks\n\t/go/src/github.com/pingcap/tidb/server/conn.go:1440\ngithub.com/pingcap/tidb/server.(*clientConn).writeResultset\n\t/go/src/github.com/pingcap/tidb/server/conn.go:1406\ngithub.com/pingcap/tidb/server.(*clientConn).handleStmt\n\t/go/src/github.com/pingcap/tidb/server/conn.go:1313\ngithub.com/pingcap/tidb/server.(*clientConn).handleQuery\n\t/go/src/github.com/pingcap/tidb/server/conn.go:1282\ngithub.com/pingcap/tidb/server.(*clientConn).dispatch\n\t/go/src/github.com/pingcap/tidb/server/conn.go:901\ngithub.com/pingcap/tidb/server.(*clientConn).Run\n\t/go/src/github.com/pingcap/tidb/server/conn.go:715\ngithub.com/pingcap/tidb/server.(*Server).onConn\n\t/go/src/github.com/pingcap/tidb/server/server.go:415"]
[2020/05/21 13:42:44.858 +00:00] [ERROR] [conn.go:730] ["command dispatched failed"] [conn=10] [connInfo="id:10, addr:10.233.117.64:55860 status:10, collation:utf8mb4_general_ci, user:root"] [command=Query] [status="inTxn:0, autocommit:1"] [sql="explain analyze select * from t"] [txn_mode=PESSIMISTIC] [err="Out Of Memory Quota![conn_id=10]\ngithub.com/pingcap/tidb/executor.(*recordSet).Next.func1\n\t/go/src/github.com/pingcap/tidb/executor/adapter.go:122\nruntime.gopanic\n\t/usr/local/go/src/runtime/panic.go:679\ngithub.com/pingcap/tidb/util/memory.(*PanicOnExceed).Action\n\t/go/src/github.com/pingcap/tidb/util/memory/action.go:96\ngithub.com/pingcap/tidb/store/tikv.(*EndCopWorkerAction).Action\n\t/go/src/github.com/pingcap/tidb/store/tikv/coprocessor.go:1179\ngithub.com/pingcap/tidb/util/memory.(*Tracker).Consume\n\t/go/src/github.com/pingcap/tidb/util/memory/tracker.go:231\ngithub.com/pingcap/tidb/store/tikv.(*copIterator).recvFromRespCh\n\t/go/src/github.com/pingcap/tidb/store/tikv/coprocessor.go:606\ngithub.com/pingcap/tidb/store/tikv.(*copIterator).Next\n\t/go/src/github.com/pingcap/tidb/store/tikv/coprocessor.go:653\ngithub.com/pingcap/tidb/distsql.(*selectResult).fetchResp\n\t/go/src/github.com/pingcap/tidb/distsql/select_result.go:95\ngithub.com/pingcap/tidb/distsql.(*selectResult).readFromChunk\n\t/go/src/github.com/pingcap/tidb/distsql/select_result.go:209\ngithub.com/pingcap/tidb/distsql.(*selectResult).Next\n\t/go/src/github.com/pingcap/tidb/distsql/select_result.go:164\ngithub.com/pingcap/tidb/executor.(*tableResultHandler).nextChunk\n\t/go/src/github.com/pingcap/tidb/executor/table_reader.go:295\ngithub.com/pingcap/tidb/executor.(*TableReaderExecutor).Next\n\t/go/src/github.com/pingcap/tidb/executor/table_reader.go:181\ngithub.com/pingcap/tidb/executor.Next\n\t/go/src/github.com/pingcap/tidb/executor/executor.go:268\ngithub.com/pingcap/tidb/executor.(*ExplainExec).generateExplainInfo\n\t/go/src/github.com/pingcap/tidb/executor/explain.go:86\ngithub.com/pingcap/tidb/executor.(*ExplainExec).Next\n\t/go/src/github.com/pingcap/tidb/executor/explain.go:53\ngithub.com/pingcap/tidb/executor.Next\n\t/go/src/github.com/pingcap/tidb/executor/executor.go:268\ngithub.com/pingcap/tidb/executor.(*recordSet).Next\n\t/go/src/github.com/pingcap/tidb/executor/adapter.go:126\ngithub.com/pingcap/tidb/server.(*tidbResultSet).Next\n\t/go/src/github.com/pingcap/tidb/server/driver_tidb.go:369\ngithub.com/pingcap/tidb/server.(*clientConn).writeChunks\n\t/go/src/github.com/pingcap/tidb/server/conn.go:1440\ngithub.com/pingcap/tidb/server.(*clientConn).writeResultset\n\t/go/src/github.com/pingcap/tidb/server/conn.go:1406\ngithub.com/pingcap/tidb/server.(*clientConn).handleStmt\n\t/go/src/github.com/pingcap/tidb/server/conn.go:1313\ngithub.com/pingcap/tidb/server.(*clientConn).handleQuery\n\t/go/src/github.com/pingcap/tidb/server/conn.go:1282\ngithub.com/pingcap/tidb/server.(*clientConn).dispatch\n\t/go/src/github.com/pingcap/tidb/server/conn.go:901\ngithub.com/pingcap/tidb/server.(*clientConn).Run\n\t/go/src/github.com/pingcap/tidb/server/conn.go:715\ngithub.com/pingcap/tidb/server.(*Server).onConn\n\t/go/src/github.com/pingcap/tidb/server/server.go:415\nruntime.goexit\n\t/usr/local/go/src/runtime/asm_amd64.s:1357"]

What is changed and how it works?

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Manual test (add detailed scripts or steps below)

Release note

  • Support the Action when memory exceed quota for TableReader Executor.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Jul 6, 2020
Merged
@ti-srebot ti-srebot added sig/execution SIG execution type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Jul 6, 2020
@ti-srebot ti-srebot added this to the v4.0.2 milestone Jul 6, 2020
wshwsh12
wshwsh12 reviewed Jul 9, 2020
View reviewed changes
Copy link
Contributor

@wshwsh12 wshwsh12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 9, 2020
@ti-srebot
Copy link
Contributor Author

@wshwsh12,Thanks for your review.

fzhedu
fzhedu approved these changes Jul 9, 2020
View reviewed changes
Copy link
Contributor

@fzhedu fzhedu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot
Copy link
Contributor Author

@fzhedu, Thanks for your review, however we are sorry that your vote won't be count. You are not a reviewer or committer or co-leader or leader for the related sigs:execution(slack).

@zz-jason zz-jason modified the milestones: v4.0.2, v4.0.3 Jul 10, 2020
@SunRunAway
Copy link
Contributor

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 10, 2020
@SunRunAway SunRunAway mentioned this pull request Jul 10, 2020
Closed
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@Yisaer
Copy link
Contributor

Yisaer commented Jul 15, 2020

/run-all-tests

@Yisaer
Copy link
Contributor

Yisaer commented Jul 15, 2020

/run-unit-test

@winoros winoros modified the milestones: v4.0.3, v4.0.4 Jul 15, 2020
@Yisaer
Copy link
Contributor

Yisaer commented Jul 15, 2020

/run-all-tests

1 similar comment
@Yisaer
Copy link
Contributor

Yisaer commented Jul 15, 2020

/run-all-tests

@Yisaer
Copy link
Contributor

Yisaer commented Jul 15, 2020

/run-all-tests

@Yisaer
Copy link
Contributor

Yisaer commented Jul 15, 2020

/run-unit-test

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 15, 2020
@SunRunAway SunRunAway merged commit fe54331 into pingcap:release-4.0 Jul 15, 2020
@SunRunAway SunRunAway deleted the release-4.0-a5829ae5e616 branch July 15, 2020 12:12
SunRunAway added a commit that referenced this pull request Jul 21, 2020
@SunRunAway
Revert "coprocessor: Exceed action for copiterator (#17324) (#18392)"
479a83d 
This reverts commit fe54331.
@SunRunAway SunRunAway mentioned this pull request Jul 21, 2020
Merged
jebter added a commit that referenced this pull request Jul 21, 2020
@SunRunAway @ti-srebot @jebter
Revert "coprocessor: Exceed action for copiterator (#17324) (#18392)" (…
762e4a4 
…#18704)

This reverts commit fe54331.

Co-authored-by: ti-srebot <[email protected]>
Co-authored-by: jebter <[email protected]>
@imtbkcat imtbkcat modified the milestones: v4.0.4, v4.0.5 Jul 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wshwsh12 wshwsh12 wshwsh12 left review comments

@SunRunAway SunRunAway SunRunAway approved these changes

@fzhedu fzhedu fzhedu approved these changes

Assignees

@Yisaer Yisaer

Labels
sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.5
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-srebot @SunRunAway @Yisaer @fzhedu @wshwsh12 @zz-jason @winoros @imtbkcat